From: Cosimo Cecchi <cosimoc@gnome.org>
Date: Wed, 19 Jan 2011 15:30:01 +0000 (+0100)
Subject: notification: be compatible with various names of the icon data hint
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~9236
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=68c482ec324fd908e6d9bece8399dcf9a71f4dae;p=gnome-shell.git

notification: be compatible with various names of the icon data hint

The hint changed its name during various iterations of the
notification daemon spec; be compatible with all of them.

https://bugzilla.gnome.org/show_bug.cgi?id=639959
---

diff --git a/js/ui/notificationDaemon.js b/js/ui/notificationDaemon.js
index 0b377a834..63062794e 100644
--- a/js/ui/notificationDaemon.js
+++ b/js/ui/notificationDaemon.js
@@ -146,9 +146,9 @@ NotificationDaemon.prototype = {
                 return new St.Icon({ icon_name: icon,
                                      icon_type: St.IconType.FULLCOLOR,
                                      icon_size: size });
-        } else if (hints.icon_data) {
+        } else if (hints['image-data']) {
             let [width, height, rowStride, hasAlpha,
-                 bitsPerSample, nChannels, data] = hints.icon_data;
+                 bitsPerSample, nChannels, data] = hints['image-data'];
             return textureCache.load_from_raw(data, data.length, hasAlpha,
                                               width, height, rowStride, size);
         } else {
@@ -238,6 +238,15 @@ NotificationDaemon.prototype = {
 
         hints = Params.parse(hints, { urgency: Urgency.NORMAL }, true);
 
+        // Be compatible with the various hints for image data
+        // 'image-data' is the latest name of this hint, introduced in 1.2
+        if (!hints['image-data']) {
+            if (hints['image_data'])
+                hints['image-data'] = hints['image_data']; // version 1.1 of the spec
+            else if (hints['icon_data'])
+                hints['image-data'] = hints['icon_data']; // previous versions of the spec
+        }
+
         let ndata = { appName: appName,
                       icon: icon,
                       summary: summary,